Unset GTK_REQUEST_NEEDED before emitting ::size-request, following this

2004-10-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
	before emitting ::size-request, following this weeks discussion
	on gtk-devel-list@gnome.org.

diff --git a/ChangeLog b/ChangeLog
index e02db09c06e7e363a184a6fe490be72847b7f9a4..35c5fd5ec3b4dba0af897feaf06022756a3a0251 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-15  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
+       before emitting ::size-request, following this weeks discussion
+       on gtk-devel-list@gnome.org.
+
        * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore 
        the size info for the current row after measuring another 
        row.  (#154945, William Jon McCann)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e02db09c06e7e363a184a6fe490be72847b7f9a4..35c5fd5ec3b4dba0af897feaf06022756a3a0251 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-10-15  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
+       before emitting ::size-request, following this weeks discussion
+       on gtk-devel-list@gnome.org.
+
        * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore 
        the size info for the current row after measuring another 
        row.  (#154945, William Jon McCann)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e02db09c06e7e363a184a6fe490be72847b7f9a4..35c5fd5ec3b4dba0af897feaf06022756a3a0251 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-10-15  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
+       before emitting ::size-request, following this weeks discussion
+       on gtk-devel-list@gnome.org.
+
        * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore 
        the size info for the current row after measuring another 
        row.  (#154945, William Jon McCann)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e02db09c06e7e363a184a6fe490be72847b7f9a4..35c5fd5ec3b4dba0af897feaf06022756a3a0251 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-10-15  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
+       before emitting ::size-request, following this weeks discussion
+       on gtk-devel-list@gnome.org.
+
        * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore 
        the size info for the current row after measuring another 
        row.  (#154945, William Jon McCann)

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 08cf897ae10b9ecc89f014730f32ea22382259da..5b462ec820e01f6574e872c071e4e5ac45c1fe3d 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1041,6 +1041,7 @@ gtk_cell_view_get_size_of_row (GtkCellView    *cell_view,
                                GtkRequisition *requisition)
 {
   GtkTreeRowReference *tmp;
+  GtkRequisition req;
 
   g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), FALSE);
   g_return_val_if_fail (path != NULL, FALSE);

diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 3a86420136101b63fa05f9c8cc098d41c72b5a40..e96e21b4052ed748ac663f9623d40c3cbeb4325a 100644 (file)
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -491,12 +491,11 @@ do_size_request (GtkWidget *widget)
 {
   if (GTK_WIDGET_REQUEST_NEEDED (widget))
     {
-      gtk_widget_ensure_style (widget);
+      gtk_widget_ensure_style (widget);      
+      GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED);
       g_signal_emit_by_name (widget,
                             "size_request",
                             &widget->requisition);
-      
-      GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED);
     }
 }